$OpenBSD: patch-spooler_DAgent_cpp,v 1.26 2015/04/05 22:25:08 robert Exp $
--- spooler/DAgent.cpp.orig	Thu Mar  5 16:54:04 2015
+++ spooler/DAgent.cpp	Fri Apr  3 23:11:10 2015
@@ -92,6 +92,11 @@
 #include <sys/mman.h>
 #include <pwd.h>
 
+#ifdef __OpenBSD__
+#include <sys/resource.h>
+extern char **environ;
+#endif
+
 /*
   This is actually from sysexits.h
   but since those windows lamers don't have it ..
@@ -1664,12 +1669,18 @@ HRESULT SendOutOfOffice(LPADRBOOK lpAdrBook, LPMDB lpM
 	}
 
 	{
+#ifndef __OpenBSD__
 		locale_t timelocale = createlocale(LC_TIME, "C");
+#endif
 		time_t now = time(NULL);
 		tm local;
 		localtime_r(&now, &local);
+#ifndef __OpenBSD__
 		strftime_l(szHeader, PATH_MAX, "\nDate: %a, %d %b %Y %T %z", &local, timelocale);
 		freelocale(timelocale);
+#else
+		strftime(szHeader, PATH_MAX, "\nDate: %a, %d %b %Y %T %z", &local);
+#endif
 	}
 
 	if (WriteOrLogError(fd, szHeader, strlen(szHeader)) != hrSuccess) {
@@ -3763,7 +3774,7 @@ int main(int argc, char *argv[]) {
 
 	DeliveryArgs sDeliveryArgs;
 	sDeliveryArgs.strPath = "";
-	sDeliveryArgs.strAutorespond = "/usr/bin/zarafa-autorespond";
+	sDeliveryArgs.strAutorespond = "/usr/local/bin/zarafa-autorespond";
 	sDeliveryArgs.bCreateFolder = false;
 	sDeliveryArgs.strDeliveryFolder.clear();
 	sDeliveryArgs.szPathSeperator = '\\';
@@ -3828,10 +3839,10 @@ int main(int argc, char *argv[]) {
 		{ "log_raw_message", "no", CONFIGSETTING_RELOADABLE },
 		{ "log_raw_message_path", "/tmp", CONFIGSETTING_RELOADABLE },
 		{ "archive_on_delivery", "no", CONFIGSETTING_RELOADABLE },
-		{ "mr_autoaccepter", "/usr/bin/zarafa-mr-accept", CONFIGSETTING_RELOADABLE },
+		{ "mr_autoaccepter", "/usr/local/bin/zarafa-mr-accept", CONFIGSETTING_RELOADABLE },
 		{ "plugin_enabled", "yes" },
-		{ "plugin_path", "/var/lib/zarafa/dagent/plugins" },
-		{ "plugin_manager_path", "/usr/share/zarafa-dagent/python" },
+		{ "plugin_path", "/var/db/zarafa/dagent/plugins" },
+		{ "plugin_manager_path", "/usr/local/share/zarafa-dagent/python" },
 		{ "default_charset", "iso-8859-15" },
 		{ "set_rule_headers", "yes", CONFIGSETTING_RELOADABLE },
 		{ "no_double_forward", "no", CONFIGSETTING_RELOADABLE },
